Skip to content

Conversation

Copy link
Contributor

Copilot AI commented Feb 4, 2026

Resolved merge conflict between the projector-in-terms refactor and recent dev changes.

Conflict Resolution

The conflict arose in ProjectorCore.re where:

  • This PR: Extracted Kind module to src/language/ProjectorKind.re to break dependency cycle between language and haz3lcore libraries
  • dev branch: Reordered livelit_projectors list to reflect Csv/Card competition for empty list context

Changes

  • Updated ProjectorKind.re with reordered projector list from dev:
    let livelit_projectors: list(t) = [
      Checkbox, Slider, SliderF, TextArea,
      Csv,  /* Competes with Card for empty list */
      Card, /* Competes with Csv for empty list */
      Livelit,
    ];
  • Kept external module reference in ProjectorCore.re: module Kind = Language.ProjectorKind;
  • Merged probe fixes, workflow cleanup, and other dev improvements

The refactor maintaining Kind as an external module is preserved while incorporating latest functional changes from dev.


✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Copilot AI changed the title [WIP] Add projector constructors to term grammar Merge dev into projector-in-terms branch Feb 4, 2026
Copilot AI requested a review from cyrus- February 4, 2026 21:00
Base automatically changed from projector-in-terms to dev February 5, 2026 01:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants